Fixes the entry-related part of #133852.

2004-02-10  Federico Mena Quintero  <federico@ximian.com>

	Fixes the entry-related part of #133852.

	* gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
	the file part of the entry if the selected item is a folder.

diff --git a/ChangeLog b/ChangeLog
index abc1f0d12d40005321b7699ffc9d41bdee6a2dd7..3f72b5076cacf1be40ec361f6933e2f51955aeda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the entry-related part of #133852.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the file part of the entry if the selected item is a folder.
+
 2004-02-10  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #133995, patch by Morten Welinder <mortenw@gnome.org>.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index abc1f0d12d40005321b7699ffc9d41bdee6a2dd7..3f72b5076cacf1be40ec361f6933e2f51955aeda 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the entry-related part of #133852.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the file part of the entry if the selected item is a folder.
+
 2004-02-10  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #133995, patch by Morten Welinder <mortenw@gnome.org>.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index abc1f0d12d40005321b7699ffc9d41bdee6a2dd7..3f72b5076cacf1be40ec361f6933e2f51955aeda 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the entry-related part of #133852.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the file part of the entry if the selected item is a folder.
+
 2004-02-10  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #133995, patch by Morten Welinder <mortenw@gnome.org>.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index abc1f0d12d40005321b7699ffc9d41bdee6a2dd7..3f72b5076cacf1be40ec361f6933e2f51955aeda 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the entry-related part of #133852.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the file part of the entry if the selected item is a folder.
+
 2004-02-10  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #133995, patch by Morten Welinder <mortenw@gnome.org>.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index abc1f0d12d40005321b7699ffc9d41bdee6a2dd7..3f72b5076cacf1be40ec361f6933e2f51955aeda 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2004-02-10  Federico Mena Quintero  <federico@ximian.com>
+
+       Fixes the entry-related part of #133852.
+
+       * gtk/gtkfilechooserdefault.c (update_chooser_entry): Don't change
+       the file part of the entry if the selected item is a folder.
+
 2004-02-10  Federico Mena Quintero  <federico@ximian.com>
 
        Fixes #133995, patch by Morten Welinder <mortenw@gnome.org>.

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 7d742f6d49be7aa6ba22700fb8c98e4cd817fb7d..f00a5a2847b74f1dad28d147701935378c8ddbd3 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -2106,8 +2106,9 @@ update_chooser_entry (GtkFileChooserDefault *impl)
 
   info = _gtk_file_system_model_get_info (impl->list_model, &child_iter);
 
-  _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->entry),
-                                        gtk_file_info_get_display_name (info));
+  if (!gtk_file_info_get_is_folder (info))
+    _gtk_file_chooser_entry_set_file_part (GTK_FILE_CHOOSER_ENTRY (impl->entry),
+                                          gtk_file_info_get_display_name (info));
 }
 
 static void